Quick review

Quick code review. Feel free to ignore changes ;)