I think the code is a bit mesh. Need some cleanup
I think the code is a bit mesh. Need some cleanup