Made things a bit more simpler and consistant