Removing so much ugly code

Whoever built this sure isnt DRY