Code improvements. Add comments. Readme update