Cleaned code
and added modules