Just some presentational changes
Removed some useless functions