Add proper indention and fix something ;