Removed function and added better formatting