Whitespace alignment
Added more functions