Reorganize things in a more better way