Dev quality

Fix Quality Issues