Removed static path. Cleaned code