Tidying up features to be more organized