Refactoring
formatting
Static support :)