Fixed style errors

@Yomguithereal Did a manual merge and made some mistakes. Sorry about this