Clean code and added some elements.