Edited white space and function spacing