Fix non inline conditions and cleanup Readme