Better code detection
WIP
Fix double spaces detection