Make it work with more code styles