Formatting and better api doc