Cleaned code before merging.