Made the code look less ugly