Merge pull request #1086 from narfbg/develop-common

Just some style changes and removed a useless check