- removed static attributes
- clean code
- renamed code
- base comments added