Made things look a little nicer and organized